[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fdf22456f1675a167abaca57e1ca017c99d0624d

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fdf22456f1675a167abaca57e1ca017c99d0624d

[git]

[-- Attachment #1: Type: text/plain, Size: 3395 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  fdf22456f1675a167abaca57e1ca017c99d0624d (commit)
      from  37b505df98dcef881e4481e6a8602fe32203844c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fdf22456f1675a167abaca57e1ca017c99d0624d
Author: Kim Barthel <kim.barthel(a)ipfire.org>
Date:   Sat Oct 13 13:26:20 2012 +0200

    suricata: Update to the latest stable version 1.3.2.
    
    Several accuracy issues were fixed. HTTP multipart parsing bugs
    were fixed. Several packet acquisition bugs were fixed. A stream
    engine bug was fixed.
    
    Fixes #10230.

-----------------------------------------------------------------------

Summary of changes:
 suricata/suricata.nm |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

Difference in files:
diff --git a/suricata/suricata.nm b/suricata/suricata.nm
index 4a92cb7..9647b66 100644
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@ -4,10 +4,8 @@
 ###############################################################################
 
 name       = suricata
-version    = 1.3
-devel_ver  = beta1
-release    = 0.1-%{devel_ver}
-thisapp    = %{name}-%{version}%{devel_ver}
+version    = 1.3.2
+release    = 1
 
 groups     = Networking/IDS
 url        = http://www.openinfosecfoundation.org/
@@ -43,11 +41,11 @@ build
 		--disable-static
 
 	install_cmds
-		mkdir -pv %{BUILDROOT}/etc
-		mkdir -pv %{BUILDROOT}/etc/suricata
-		mkdir -pv %{BUILDROOT}/etc/suricata/rules
-		cp -vf %{DIR_SOURCE}/%{name}.conf %{BUILDROOT}/etc/suricata
-		mkdir -pv %{BUILDROOT}/var/log/suricata
+		mkdir -pv %{BUILDROOT}%{sysconfdir}
+		mkdir -pv %{BUILDROOT}%{sysconfdir}/suricata
+		mkdir -pv %{BUILDROOT}%{sysconfdir}/suricata/rules
+		cp -vf %{DIR_SOURCE}/%{name}.conf %{BUILDROOT}%{sysconfdir}/suricata
+		mkdir -pv %{BUILDROOT}%{localstatedir}/log/suricata
 	end
 
 end
@@ -59,25 +57,25 @@ packages
 		prerquires = systemd-units
 
 		configfiles
-			/etc/suricata/suricata.conf
+			%{BUILDROOT}%{sysconfdir}/suricata/suricata.conf
 		end
 
 		script postin
-			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+			systemctl daemon-reload >/dev/null 2>&1 || :
 		end
 
 		script preun
-			/bin/systemctl --no-reload disable suricata.service >/dev/null 2>&1 || :
-			/bin/systemctl stop suricata.service >/dev/null 2>&1 || :
+			systemctl --no-reload disable suricata.service >/dev/null 2>&1 || :
+			systemctl stop suricata.service >/dev/null 2>&1 || :
 		end
 
 		script postun
-			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+			systemctl daemon-reload >/dev/null 2>&1 || :
 		end
 
 		script postup
-			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-			/bin/systemctl try-restart suricata.service >/dev/null 2>&1 || :
+			systemctl daemon-reload >/dev/null 2>&1 || :
+			systemctl try-restart suricata.service >/dev/null 2>&1 || :
 		end
 
 	end


hooks/post-receive
--
IPFire 3.x development tree