<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d26fe53294848c783f9ae4cf5c1f61b7ae49bae0">https://github.com/macports/macports-ports/commit/d26fe53294848c783f9ae4cf5c1f61b7ae49bae0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d26fe53 base: Delete old port
</span>d26fe53 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d26fe53294848c783f9ae4cf5c1f61b7ae49bae0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Oct 5 14:59:19 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> base: Delete old port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The last release was 1.4.5 in March 2010.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In Feburary 2018 the developer said:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> > BASE has not been upodated in years. I retired from the project and
</span><span style='display:block; white-space:pre;color:#404040;'> > handed it off to someone else. They got busy (I guess)
</span><span style='display:block; white-space:pre;color:#404040;'> > But you should NOT still be running this software.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://sourceforge.net/p/secureideas/discussion/404428/thread/08d23885/
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/56424
</span>---
security/base/Portfile | 62 -----
security/base/files/patch-base.diff | 450 ------------------------------------
2 files changed, 512 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/base/Portfile b/security/base/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 832b4f2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,62 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name base
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories security
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Basic Analysis and Security Engine - Snort web frontend
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Basic Analysis and Security Engine - based on the ACID \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- project. It provides a web front-end to query and analyze \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the alerts from SNORT.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://base.professionallyevil.com
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:secureideas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e66552039a806d09db40f1e7f363b2cd68cde064 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 23910f5277ceb43398442074e444182941bf7f6da85efd84ecdd0cf62c4b8935
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:gd2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:adodb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pear-Mail port:pear-Mail_Mime port:pear-Image_Graph \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pear-Image_Canvas port:pear-Image_Color port:pear-Numbers_Roman
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## http://sourceforge.net/p/secureideas/patches/27/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## +mysql support through mysqli extension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-base.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set basedir ${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set docsdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${basedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file [glob -directory ${worksrcpath}/ *] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${file} ${destroot}${basedir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\$DBlib_path = '';|\$DBlib_path = '${prefix}/share/adodb5';|g" ${destroot}${basedir}/base_conf.php.dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Not sure if needed. If the file exists, wizard says you need to delete it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file exists ${basedir}/base_conf.php ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${basedir}/base_conf.php.dist ${basedir}/base_conf.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Read the files under ${prefix}/share/base/docs, especially README and INSTALL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Note that this software is installed under ${prefix}/share/base
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This version was released in 2010 and the authors consider it BETA;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-you may want to consider other software options.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/base/files/patch-base.diff b/security/base/files/patch-base.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dbffa43..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/base/files/patch-base.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,450 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/base_db_common.php ./base_db_common.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/base_db_common.php 2010-03-05 10:06:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./base_db_common.php 2014-03-12 15:00:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,7 +80,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " "._ERRPHPERROR2."</FONT>";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($DBtype == "mysql") || ($DBtype == "mysqlt") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($DBtype == "mysql") || ($DBtype == "mysqlt") || ($DBtype == "mysqli"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !(function_exists("mysql_connect")) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/base_graph_display.php ./base_graph_display.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/base_graph_display.php 2010-03-05 10:06:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./base_graph_display.php 2014-03-12 14:59:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,7 +114,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Create the graph area, legends on bottom -- Alejandro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $Graph =& new Image_Graph(array('driver'=>'gd',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $Graph = new Image_Graph(array('driver'=>'gd',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'width'=>$width,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'height'=>$height));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -320,27 +320,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // special case '"I0" => "private network (rfc 1918)"' and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // '"** (private network) " => "private network (rfc 1918)"'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ereg("rfc 1918", $tmp, $substring) || (ereg("[*][*] \(private network\) ", $tmp_lower, $substring)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preg_match("/rfc 1918/", $tmp, $substring) || (preg_match("/[*][*] \(private network\) /", $tmp_lower, $substring)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Dataset->addPoint("private network (rfc 1918)", $xdata[$i][1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // special case '?? (Not Found) ' => 'unknown'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif(ereg("[?][?][ \t]+\(Not Found\)[ \t]*", $tmp, $substring))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif(preg_match("/[?][?][ \t]+\(Not Found\)[ \t]*/", $tmp, $substring))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Dataset->addPoint("unknown", $xdata[$i][1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // anything inside parentheses, following a 2-letter TLD:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif (ereg("^[-a-zA-Z0-9]{2}[ \t]\((.+)\)[ \t]*$", $tmp, $substring))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif (preg_match("/^[-a-zA-Z0-9]{2}[ \t]\((.+)\)[ \t]*$/", $tmp, $substring))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Dataset->addPoint($substring[1], $xdata[$i][1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // anything after two-letter top level domain names and after one space or tab:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif (ereg("[ \t]*[-a-zA-Z0-9]{2}[ \t]([-a-zA-Z0-9]+[-a-zA-Z0-9 ]*)", $tmp, $substring))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif (preg_match("/[ \t]*[-a-zA-Z0-9]{2}[ \t]([-a-zA-Z0-9]+[-a-zA-Z0-9 ]*)/", $tmp, $substring))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Dataset->addPoint($substring[1], $xdata[$i][1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // two-letter top level domain names right at the beginning:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif (ereg("[ \t]*([-a-zA-Z0-9]{2})[ \t]", $tmp_lower, $substring))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif (preg_match("/[ \t]*([-a-zA-Z0-9]{2})[ \t]/", $tmp_lower, $substring))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Dataset->addPoint($substring[1], $xdata[$i][1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/base_qry_common.php ./base_qry_common.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/base_qry_common.php 2010-03-05 10:06:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./base_qry_common.php 2014-03-12 14:59:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -773,10 +773,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* if have chosen the address type to be both source and destination */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ereg("ip_both", $tmp) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( preg_match("/ip_both/", $tmp) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $tmp_src = ereg_replace("ip_both","ip_src",$tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $tmp_dst = ereg_replace("ip_both","ip_dst",$tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $tmp_src = preg_replace("/ip_both/","ip_src",$tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $tmp_dst = preg_replace("/ip_both/","ip_dst",$tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( $ip_addr[$i][2] == '=' )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $tmp = "(".$tmp_src.') OR ('.$tmp_dst.')';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/base_qry_sqlcalls.php ./base_qry_sqlcalls.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/base_qry_sqlcalls.php 2010-03-05 10:06:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./base_qry_sqlcalls.php 2014-03-12 14:59:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,9 +259,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $line = split (" ", $current_sig_txt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach ($line as $ps_element)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ereg("[0-9]*\.[0-9]*\.[0-9]*\.[0-9]", $ps_element) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( preg_match("/[0-9]*\.[0-9]*\.[0-9]*\.[0-9]/", $ps_element) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $ps_element = ereg_replace (":", "", $ps_element);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $ps_element = preg_replace ("/:/", "", $ps_element);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qroPrintEntry("<A HREF=\"base_stat_ipaddr.php?ip=".$ps_element."&netmask=32\">".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ps_element."</A>");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/base_stat_common.php ./base_stat_common.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/base_stat_common.php 2010-03-05 10:06:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./base_stat_common.php 2014-03-12 15:00:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -312,7 +312,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!stristr($where, "WHERE") && $where != "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $where = " WHERE $where ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( $db->DB_type == "mysql" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( $join == "" && $where == "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $result = $db->baseExecute("SELECT COUNT(DISTINCT acid_event.ip_src, acid_event.ip_dst, acid_event.ip_proto) FROM acid_event");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/base_stat_ipaddr.php ./base_stat_ipaddr.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/base_stat_ipaddr.php 2010-03-05 10:06:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./base_stat_ipaddr.php 2014-03-12 14:59:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print "</PRE><BR>\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(ereg($ip, $contents)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(preg_match("/$ip/", $contents)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $total++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( $total % 2 == 0 ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $color="DDDDDD";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,7 +143,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $color="FFFFFF";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $contents = ereg_replace(" ", " ", $contents);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $contents = preg_replace("/ /", " ", $contents);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $elements = explode(" ", $contents);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo '<tr bgcolor="'.$color.'"><td align="center">'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -183,7 +183,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print "</PRE></TD>";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ereg("([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*):([0-9]*)",$elements[3],$store);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ preg_match("/([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*):([0-9]*)/",$elements[3],$store);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $source_ip = $store[1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $source_port = $store[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (empty($source_ip))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,7 +197,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo '<td align="center">' . $source_ip . '</td>';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo '<td align="center">' . $source_port . '</td>';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ereg("([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*):([0-9]*)",$elements[5],$store);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ preg_match("/([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*):([0-9]*)/",$elements[5],$store);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $destination_ip = $store[1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $destination_port = $store[2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (empty($destination_ip))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/includes/base_db.inc.php ./includes/base_db.inc.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/includes/base_db.inc.php 2010-03-05 10:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./includes/base_db.inc.php 2014-03-12 15:00:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,7 +77,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLOBAL $sql_trace_mode, $sql_trace_file;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $this->DB = NewADOConnection();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // If they have mysqli, use it. Otherwise, fall back to the older "mysql" extension.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($this->DB_type == 'mysql') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (extension_loaded('mysqli')) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $this->DB_type = 'mysqli';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $this->DB_type = 'mysql';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $this->DB = NewADOConnection($this->DB_type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $this->DB_name = $database;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $this->DB_host = $host;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $this->DB_port = $port;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,7 +117,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set the database schema version number */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $sql = "SELECT vseq FROM schema";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ($this->DB_type == "mysql") $sql = "SELECT vseq FROM `schema`";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($this->DB_type == "mysql" || $this->DB_type == "mysqli") $sql = "SELECT vseq FROM `schema`";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($this->DB_type == "mssql") $sql = "SELECT vseq FROM [schema]";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $result = $this->DB->Execute($sql);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,8 +147,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function basePConnect($database, $host, $port, $username, $password)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLOBAL $sql_trace_mode, $sql_trace_file;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // If they have mysqli, use it. Otherwise, fall back to the older "mysql" extension.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($this->DB_type == 'mysql') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (extension_loaded('mysqli')) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $this->DB_type = 'mysqli';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $this->DB_type = 'mysql';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $this->DB = NewADOConnection();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $this->DB = NewADOConnection($this->DB_type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $this->DB_name = $database;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $this->DB_host = $host;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $this->DB_port = $port;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +189,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set the database schema version number */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $sql = "SELECT vseq FROM schema";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($this->DB_type == "mssql") $sql = "SELECT vseq FROM [schema]";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ($this->DB_type == "mysql") $sql = "SELECT vseq FROM `schema`";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($this->DB_type == "mysql" || $this->DB_type == "mysqli") $sql = "SELECT vseq FROM `schema`";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $result = $this->DB->Execute($sql);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( $this->baseErrorMessage() != "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -209,7 +227,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ** Begin DB specific SQL fix-up ** */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($this->DB_type == "mssql")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $sql = eregi_replace("''", "NULL", $sql);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $sql = preg_replace("/''/i", "NULL", $sql);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($this->DB_type == "oci8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -231,7 +249,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $rs = new baseRS($this->DB->Execute($sql), $this->DB_type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $rs = new baseRS($this->DB->Execute($sql." LIMIT ".$start_row.", ".$num_rows),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -321,7 +339,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * the current point, so it can't be here and needs to be in the actual script after calling this function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * -- srh (02/01/2001)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($this->DB_type == "maxsql") || ($this->DB_type == "mssql"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $this->DB->Insert_ID();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if ($this->DB_type == "postgres" ||($this->DB_type == "oci8"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,7 +354,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function baseSQL_YEAR($func_param, $op, $timestamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($this->DB_type == "maxsql") || ($this->DB_type == "mssql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " YEAR($func_param) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if( $this->DB_type == "oci8" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -347,7 +365,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function baseSQL_MONTH($func_param, $op, $timestamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($this->DB_type == "maxsql") || ($this->DB_type == "mssql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " MONTH($func_param) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if( $this->DB_type == "oci8" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -358,7 +376,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function baseSQL_DAY($func_param, $op, $timestamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " DAYOFMONTH($func_param) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if($this->DB_type == "oci8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " to_number( to_char( $func_param, 'DD' ) ) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -370,7 +388,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function baseSQL_HOUR($func_param, $op, $timestamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " HOUR($func_param) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if($this->DB_type == "oci8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " to_number( to_char( $func_param, 'HH' ) ) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,7 +400,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function baseSQL_MINUTE($func_param, $op, $timestamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " MINUTE($func_param) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if($this->DB_type == "oci8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " to_number( to_char( $func_param, 'MI' ) ) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -394,7 +412,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function baseSQL_SECOND($func_param, $op, $timestamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " SECOND($func_param) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if($this->DB_type == "oci8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " to_number( to_char( $func_param, 'SS' ) ) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -406,7 +424,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function baseSQL_UNIXTIME($func_param, $op, $timestamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " UNIX_TIMESTAMP($func_param) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -432,7 +450,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function baseSQL_TIMESEC($func_param, $op, $timestamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " TIME_TO_SEC($func_param) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if($this->DB_type == "oci8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return " to_number( $func_param ) $op $timestamp ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -549,7 +567,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Is This if statement necessary? -- Kevin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* MS SQL Server 7, MySQL, Sybase, and Postgres natively support this function */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($this->DB_type == "mssql") || ($this->DB_type == "sybase") || ($this->DB_type == "postgres") || ($this->DB_type == "oci8"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $this->row->RecordCount();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -623,6 +641,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($type == "mysql") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($type == "mysqlt") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ($type == "mysqli") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($type == "maxsql") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($type == "postgres") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ($type == "mssql") ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/includes/base_net.inc.php ./includes/base_net.inc.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/includes/base_net.inc.php 2010-03-05 10:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./includes/base_net.inc.php 2014-03-12 14:59:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -391,7 +391,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $line = explode(" ", $response_l[$i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for ($j=0; $j < sizeof($line); $j++ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$", $line[$j]) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/i", $line[$j]) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( $email == "" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $email = $line[$j];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/includes/base_signature.inc.php ./includes/base_signature.inc.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/includes/base_signature.inc.php 2010-03-05 10:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./includes/base_signature.inc.php 2014-03-12 14:59:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,7 +139,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($tmp_ref_system_name == "snort")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ereg("([0-9]+):([0-9]+)", $ref_tag, $backref))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (preg_match("/([0-9]+):([0-9]+)/", $ref_tag, $backref))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($backref[1] == "1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/includes/base_state_citems.inc.php ./includes/base_state_citems.inc.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/includes/base_state_citems.inc.php 2010-03-05 10:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./includes/base_state_citems.inc.php 2014-03-12 14:59:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -963,7 +963,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for ( $i = 0; $i < $this->criteria_cnt; $i++ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( (isset ($this->criteria[$i][3])) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (ereg("([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)", $this->criteria[$i][3])) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (preg_match("/([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)/", $this->criteria[$i][3])) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $tmp_ip_str = $this->criteria[$i][7] = $this->criteria[$i][3];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $this->criteria[$i][3] = strtok($tmp_ip_str, ".");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/includes/base_state_common.inc.php ./includes/base_state_common.inc.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/includes/base_state_common.inc.php 2010-03-05 10:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./includes/base_state_common.inc.php 2014-03-12 14:59:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -181,7 +181,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( ($valid_data & VAR_SCORE) > 0 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $regex_mask = $regex_mask . "\-";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return ereg_replace("[^".$regex_mask."]", "", $item);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return preg_replace("/[^".$regex_mask."]/", "", $item);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ***********************************************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/includes/base_state_criteria.inc.php ./includes/base_state_criteria.inc.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/includes/base_state_criteria.inc.php 2010-03-05 10:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./includes/base_state_criteria.inc.php 2014-03-12 14:59:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -252,7 +252,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( isset($_POST['current_view']) ) $query_string .= "&current_view=".$_POST['current_view'];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( isset($_POST['submit']) ) $query_string .= "&submit=".$_POST['submit'];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $query_string = ereg_replace("back=1&", "", CleanVariable($query_string, VAR_PERIOD | VAR_DIGIT | VAR_PUNC | VAR_LETTER));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $query_string = preg_replace("/back=1&/", "", CleanVariable($query_string, VAR_PERIOD | VAR_DIGIT | VAR_PUNC | VAR_LETTER));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ++$_SESSION['back_list_cnt'];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $_SESSION['back_list'][$_SESSION['back_list_cnt']] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/setup/setup2.php ./setup/setup2.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/setup/setup2.php 2010-03-05 10:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./setup/setup2.php 2014-03-12 15:00:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +68,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $arcdbpasswd = ImportHTTPVar("arcdbpasswd");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $arcdbname = ImportHTTPVar("arcdbname", VAR_ALPHA | VAR_SCORE | VAR_USCORE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // If they have mysqli, use it. Otherwise, fall back to the older "mysql" extension.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($dbtype == 'mysql') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (extension_loaded('mysqli')) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $dbtype = 'mysqli';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $dbtype = 'mysql';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $db = NewADOConnection($dbtype);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $dbconnect = $db->Connect( ( ( $dbport == "") ? $dbhost : ($dbhost.":".$dbport) ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $dbusername, $dbpasswd, $dbname);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../base-1.4.5.orig/setup/setup_db.inc.php ./setup/setup_db.inc.php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../base-1.4.5.orig/setup/setup_db.inc.php 2010-03-05 10:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./setup/setup_db.inc.php 2014-03-12 15:00:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !$tblBaseAG_present ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( $db->DB_type == "mysql" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $sql = 'CREATE TABLE acid_ag ( ag_id INT UNSIGNED NOT NULL AUTO_INCREMENT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ag_name VARCHAR(40),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ag_desc TEXT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,7 +114,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !$tblBaseAGAlert_present ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( $db->DB_type == "mysql" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $sql = 'CREATE TABLE acid_ag_alert( ag_id INT UNSIGNED NOT NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ag_sid INT UNSIGNED NOT NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ag_cid INT UNSIGNED NOT NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,7 +151,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !$tblBaseIPCache_present ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( $db->DB_type == "mysql" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $sql = 'CREATE TABLE acid_ip_cache( ipc_ip INT UNSIGNED NOT NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ipc_fqdn VARCHAR(50),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ipc_dns_timestamp DATETIME,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -193,7 +193,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !$tblBaseEvent_present ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( $db->DB_type == "mysql" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( $db->baseGetDBversion() < 100 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $sig_ddl = "signature VARCHAR(255) NOT NULL,";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -319,7 +319,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Added for base_roles and base_users -- Kevin */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !$tblBaseRoles_present ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( $db->DB_type == "mysql" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $sql = 'CREATE TABLE base_roles ( role_id int(11) NOT NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- role_name varchar(20) NOT NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- role_desc varchar(75) NOT NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -385,7 +385,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !$tblBaseUsers_present ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( $db->DB_type == "mysql" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $sql = 'CREATE TABLE base_users ( usr_id int(11) NOT NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usr_login varchar(25) NOT NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usr_pwd varchar(32) NOT NULL,
</span></pre><pre style='margin:0'>
</pre>