[suricata/f14] New upstream release

[Steve Grubb]

commit 2e408d74f75766a3967f020710ab415bc3402193
Author: Steve <sgrubb at redhat.com>
Date:   Mon Jul 25 12:06:58 2011 -0400

    New upstream release

 sources                    |    4 ++--
 suricata-1.0.5-flags.patch |   27 +++++++++++++++++++++++++++
 suricata.spec              |    7 ++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 7acf24c..a1e817e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bb69eff00783e64c75a94e29a6400ef4  suricata-1.0.4.tar.gz
-8e8af21d061da1b5b2b28ca76e6540ed  suricata-1.0.4.tar.gz.sig
+38a76efd1c9c0d01f6bb49d75dd1b440  suricata-1.0.5.tar.gz
+f0ae2852184fa13d348a6d8c27fb42d5  suricata-1.0.5.tar.gz.sig
diff --git a/suricata-1.0.5-flags.patch b/suricata-1.0.5-flags.patch
new file mode 100644
index 0000000..08e6c83
--- /dev/null
+++ b/suricata-1.0.5-flags.patch
@@ -0,0 +1,27 @@
+diff -ur suricata-1.0.5.orig/libhtp/htp/Makefile.am suricata-1.0.5/libhtp/htp/Makefile.am
+--- suricata-1.0.5.orig/libhtp/htp/Makefile.am	2011-07-25 09:17:35.000000000 -0400
++++ suricata-1.0.5/libhtp/htp/Makefile.am	2011-07-25 10:54:59.000000000 -0400
+@@ -10,4 +10,4 @@
+ 
+ lib_LTLIBRARIES= libhtp.la
+ libhtp_la_SOURCES= $(h_sources) $(c_sources)
+-libhtp_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE)
++libhtp_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE) -Wl,-z,relro
+diff -ur suricata-1.0.5.orig/src/Makefile.am suricata-1.0.5/src/Makefile.am
+--- suricata-1.0.5.orig/src/Makefile.am	2011-07-25 09:17:35.000000000 -0400
++++ suricata-1.0.5/src/Makefile.am	2011-07-25 10:54:09.000000000 -0400
+@@ -223,12 +223,12 @@
+ 
+ 
+ # the library search path.
+-suricata_LDFLAGS = $(all_libraries)
++suricata_LDFLAGS = $(all_libraries) -pie
+ 
+ if BUILD_LIBHTP
+ suricata_LDADD = $(top_builddir)/libhtp/htp/libhtp.la
+ INCLUDES += -I$(top_srcdir)/libhtp
+ endif
+ 
+-#suricata_CFLAGS = -Wall -fno-strict-aliasing 
++suricata_CFLAGS = -Wall -fno-strict-aliasing -DPIE -fPIE 
+ 
diff --git a/suricata.spec b/suricata.spec
index 91c3ece..3d7e549 100644
--- a/suricata.spec
+++ b/suricata.spec
@@ -1,7 +1,7 @@
 
 Summary: Intrusion Detection System
 Name: suricata
-Version: 1.0.4
+Version: 1.0.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -10,6 +10,7 @@ Source0: http://www.openinfosecfoundation.org/download/%{name}-%{version}.tar.gz
 Source1: suricata.init
 Source2: suricata.sysconfig
 Source3: suricata.logrotate
+Patch1:  suricata-1.0.5-flags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libyaml-devel libprelude-devel
 BuildRequires: libnfnetlink-devel libnetfilter_queue-devel libnet-devel
@@ -30,6 +31,7 @@ GPU cards.
 
 %prep
 %setup -q
+%patch1 -p1
 # This is to fix rpaths created by bad Makefile.in
 autoreconf -fv --install
 
@@ -93,6 +95,9 @@ fi
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/suricata
 
 %changelog
+* Fri Jul 25 2011 Steve Grubb <sgrubb at redhat.com> 1.0.5-1
+- New upstream release
+
 * Fri Jun 24 2011 Steve Grubb <sgrubb at redhat.com> 1.0.4-1
 - New upstream release