[suricata/f18] New upstream bugfix release

[Steve Grubb]

commit f01660d456cc274cfb0d47d136dffa0d56153648
Author: Steve <sgrubb at redhat.com>
Date:   Thu Apr 4 05:34:42 2013 -0400

    New upstream bugfix release
    
    - Enable libgeoip support
    - Switch to stack-protector-all

 suricata-1.1.1-flags.patch |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/suricata-1.1.1-flags.patch b/suricata-1.1.1-flags.patch
index e2e712c..9c5dfb3 100644
--- a/suricata-1.1.1-flags.patch
+++ b/suricata-1.1.1-flags.patch
@@ -1,17 +1,16 @@
-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 -
+diff -ur suricata-1.4.orig/doc/Makefile.am suricata-1.4/doc/Makefile.am
+--- suricata-1.4.orig/doc/Makefile.am	2012-12-13 10:03:16.000000000 -0500
++++ suricata-1.4/doc/Makefile.am	2012-12-20 12:11:53.821394100 -0500
+@@ -30,5 +30,3 @@
+ Ubuntu_Installation_from_GIT.txt \
+ Windows.txt
  
- 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)
+-docdir = ${datarootdir}/doc/${PACKAGE}
+-dist_doc_DATA = ${EXTRA_DIST}
+diff -ur suricata-1.4.orig/src/Makefile.am suricata-1.4/src/Makefile.am
+--- suricata-1.4.orig/src/Makefile.am	2012-12-13 10:03:17.000000000 -0500
++++ suricata-1.4/src/Makefile.am	2012-12-20 12:13:13.080066314 -0500
+@@ -328,7 +328,7 @@
  
  
  # the library search path.
@@ -20,12 +19,14 @@ diff -urp suricata-1.1.1.orig/src/Makefile.am suricata-1.1.1/src/Makefile.am
  
  if BUILD_LIBHTP
  suricata_LDADD = $(top_builddir)/libhtp/htp/libhtp.la
-@@ -326,7 +326,7 @@ CLEANFILES = $(PTXS) cuda-ptxdump.h
+@@ -385,8 +385,8 @@
  endif
  
  
 -#suricata_CFLAGS = -Wall -fno-strict-aliasing 
-+suricata_CFLAGS = -Wall -fno-strict-aliasing -DPIE -fPIE 
+-AM_CFLAGS = -DLOCAL_STATE_DIR=\"$(localstatedir)\"
++#suricata_CFLAGS = -Wall -fno-strict-aliasing
++AM_CFLAGS = -DLOCAL_STATE_DIR=\"$(localstatedir)\" -DPIE -fPIE
  
  if BUILD_UNITTESTS
  check-am: