Merge remote-tracking branch 'maniacikarus/ids'

diff --git a/oinkmaster/oinkmaster.nm b/oinkmaster/oinkmaster.nm
index d920d7f7b08132619451148af7fc96fdd1017ee3..f9f5e6dd84b8b6f04d8c4dd8ca3529125d0aaf04 100644 (file)
--- a/oinkmaster/oinkmaster.nm
+++ b/oinkmaster/oinkmaster.nm
@@ -5,7 +5,8 @@
 
 name       = oinkmaster
 version    = 2.0
-release    = 1
+release    = 2
+arch       = noarch
 
 groups     = Development/Libraries
 url        = http://oinkmaster.sourceforge.net
@@ -24,12 +25,15 @@ build
        end
 
        build
-               # Nothing to do here.
+               echo "url = http://rules.emergingthreats.net/open/suricata/emerging.rules.tar.gz" >> oinkmaster.conf
+               echo "tmpdir = /var/tmp/" >> oinkmaster.conf
        end
 
        install
                mkdir -pv %{BUILDROOT}/usr/sbin
                install -m 755 oinkmaster.pl %{BUILDROOT}/usr/sbin
+               mkdir -pv %{BUILDROOT}/etc
+               install -m 644 oinkmaster.conf %{BUILDROOT}/etc
        end
 end
 

diff --git a/suricata/suricata.conf b/suricata/suricata.conf
index 672a306966d1e644cca3fa74c386e5ce61a78ad1..d1d5a257947270e224c1cdc2ceb753106c9ac780 100644 (file)
--- a/suricata/suricata.conf
+++ b/suricata/suricata.conf
@@ -1,7 +1,7 @@
 %YAML 1.1
 ---
 # Suricata Emergingthreats Pro Open Rulesets Recommended
-reference-config-file: /etc/suricata/reference.config
+reference-config-file: /etc/suricata/rules/reference.config
 
 # Number of packets allowed to be processed simultaneously.  Default is a
 # conservative 50. a higher number will make sure CPU's/CPU cores will be
@@ -388,7 +388,7 @@ rule-files:
 # - emerging-tor.rules
 # - emerging-mobile_malware.rules
 
-classification-file: /etc/suricata/classification.config
+classification-file: /etc/suricata/rules/classification.config
 
 # Holds variables that would be used by the engine.
 vars:

diff --git a/suricata/suricata.nm b/suricata/suricata.nm
index 5de62ef20d787a23a5bf7da7ddf9b80e80b00ac6..e9ac31fecea8153536979dd264a443f82404147e 100644 (file)
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@ -3,9 +3,9 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = suricata
-version    = 1.1beta3
-release    = 5
+name      = suricata
+version   = 1.1
+release   = 1
 
 groups     = Networking/IDS
 url        = http://www.openinfosecfoundation.org/