[suricata/f15] New upstream release

[Steve Grubb]

commit ed92e1221d4eb5985ec36db1d4dcc403e8478271
Author: Steve <sgrubb at redhat.com>
Date:   Wed Dec 7 13:09:43 2011 -0500

    New upstream release

 sources                    |    4 ++--
 suricata-1.0.5-flags.patch |   27 ---------------------------
 suricata-1.1.1-flags.patch |   31 +++++++++++++++++++++++++++++++
 suricata.spec              |    9 ++++++---
 4 files changed, 39 insertions(+), 32 deletions(-)
---
diff --git a/sources b/sources
index a1e817e..8546847 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-38a76efd1c9c0d01f6bb49d75dd1b440  suricata-1.0.5.tar.gz
-f0ae2852184fa13d348a6d8c27fb42d5  suricata-1.0.5.tar.gz.sig
+6f011407b67edf10783197b1a087d7cb  suricata-1.1.1.tar.gz
+ec72e2369d9f19fceb59769166711590  suricata-1.1.1.tar.gz.sig
diff --git a/suricata-1.1.1-flags.patch b/suricata-1.1.1-flags.patch
new file mode 100644
index 0000000..e2e712c
--- /dev/null
+++ b/suricata-1.1.1-flags.patch
@@ -0,0 +1,31 @@
+diff -urp suricata-1.1.1.orig/libhtp/htp/Makefile.am suricata-1.1.1/libhtp/htp/Makefile.am
+--- suricata-1.1.1.orig/libhtp/htp/Makefile.am	2011-12-07 10:52:59.000000000 -0500
++++ suricata-1.1.1/libhtp/htp/Makefile.am	2011-12-07 12:21:47.000000000 -0500
+@@ -10,5 +10,5 @@ AM_CFLAGS = -D_GNU_SOURCE -g -O2 -Wall -
+ 
+ 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 -urp suricata-1.1.1.orig/src/Makefile.am suricata-1.1.1/src/Makefile.am
+--- suricata-1.1.1.orig/src/Makefile.am	2011-12-07 10:52:59.000000000 -0500
++++ suricata-1.1.1/src/Makefile.am	2011-12-07 12:23:18.000000000 -0500
+@@ -269,7 +269,7 @@ INCLUDES= $(all_includes)
+ 
+ 
+ # the library search path.
+-suricata_LDFLAGS = $(all_libraries)
++suricata_LDFLAGS = $(all_libraries) -pie
+ 
+ if BUILD_LIBHTP
+ suricata_LDADD = $(top_builddir)/libhtp/htp/libhtp.la
+@@ -326,7 +326,7 @@ CLEANFILES = $(PTXS) cuda-ptxdump.h
+ endif
+ 
+ 
+-#suricata_CFLAGS = -Wall -fno-strict-aliasing 
++suricata_CFLAGS = -Wall -fno-strict-aliasing -DPIE -fPIE 
+ 
+ if BUILD_UNITTESTS
+ check-am:
diff --git a/suricata.spec b/suricata.spec
index 3d7e549..8664cec 100644
--- a/suricata.spec
+++ b/suricata.spec
@@ -1,16 +1,16 @@
 
 Summary: Intrusion Detection System
 Name: suricata
-Version: 1.0.5
+Version: 1.1.1
 Release: 1%{?dist}
-License: GPLv2+
+License: GPLv2
 Group: Applications/Internet
 URL: http://www.openinfosecfoundation.org
 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
+Patch1:  suricata-1.1.1-flags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libyaml-devel libprelude-devel
 BuildRequires: libnfnetlink-devel libnetfilter_queue-devel libnet-devel
@@ -95,6 +95,9 @@ fi
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/suricata
 
 %changelog
+* Wed Dec 07 2011 Steve Grubb <sgrubb at redhat.com> 1.1.1-1
+- New upstream release
+
 * Fri Jul 25 2011 Steve Grubb <sgrubb at redhat.com> 1.0.5-1
 - New upstream release