From 90ef97fb7c7e716ab46c9d187add50a7bd0dbd77 Mon Sep 17 00:00:00 2001
From: robiscool <robrob2626@yahoo.com>
Date: Thu, 26 Aug 2010 00:05:33 -0700
Subject: snort, update binaries for 1.2.3 x86, 2.0 x86, x64, update rule files
 to match.

---
 pkg_config.8.xml.amd64 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'pkg_config.8.xml.amd64')

diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 3860feee..04283874 100755
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -307,10 +307,17 @@
       <website>http://www.snort.org</website>
       <descr>Used by fortune 500 companies and governments Snort is the most widely deployed IDS/IPS technology worldwide. It features rules based logging and can perform content searching/matching in addition to being used to detect a variety of other attacks and probes, such as buffer overflows, stealth port scans, CGI attacks, SMB probes, and much more.</descr>
       <category>Security</category>
+<<<<<<< HEAD
       <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort/bin/8.0.x86/</depends_on_package_base_url>
 	  <depends_on_package>pcre-8.02.tbz</depends_on_package>
 	  <depends_on_package>perl-5.10.1_2.tbz</depends_on_package>
       <depends_on_package>mysql-client-5.0.90.tbz</depends_on_package>
+=======
+      <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort/bin/8.1x64/</depends_on_package_base_url>
+	  <depends_on_package>pcre-8.10.tbz</depends_on_package>
+	  <depends_on_package>perl-threaded-5.12.1_1.tbz</depends_on_package>
+      <depends_on_package>mysql-client-5.1.50_1.tbz</depends_on_package>
+>>>>>>> snort, update binaries for 1.2.3 x86, 2.0 x86, x64, update rule files to match.
 	  <depends_on_package>snort-2.8.6.1.tbz</depends_on_package>
 	  <build_port_path>/usr/ports/devel/pcre</build_port_path>
 	  <build_port_path>/usr/ports/lang/perl5.10</build_port_path>
@@ -318,7 +325,7 @@
 	  <build_port_path>/usr/ports/security/snort</build_port_path>
 	<build_options>WITHOUT_DEBUGGING=true WITHOUT_GDBM=true WITHOUT_PERL_MALLOC=true WITH_PERL_64BITINT=true WITHOUT_THREADS=true WITHOUT_MULTIPLICITY=true WITHOUT_SUIDPERL=true WITHOUT_SITECUSTOMIZE=true WITH_USE_PERL=true</build_options>
       <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
-      <version>2.8.6 pkg v. 1.31</version>
+      <version>2.8.6.1 pkg v. 1.33</version>
       <required_version>2.0</required_version>
       <status>Stable</status>
       <configurationfile>/snort.xml</configurationfile>
-- 
cgit v1.2.3