[suricata/f19] Major new upstream release with new features

[Steve Grubb]

commit 3b1a1308c8362f01b04f0c5af9fac64bfcd6cc65
Author: sgrubb <sgrubb at redhat.com>
Date:   Wed May 7 12:00:00 2014 -0400

    Major new upstream release with new features

 fedora.notes                                |    2 +-
 sources                                     |    2 +-
 suricata-1.1.1-flags.patch                  |   32 ------------------
 suricata-1.4.1-stack-protector-strong.patch |   17 ----------
 suricata-2.0-flags.patch                    |   46 +++++++++++++++++++++++++++
 suricata.spec                               |   13 ++++---
 6 files changed, 55 insertions(+), 57 deletions(-)
---
diff --git a/fedora.notes b/fedora.notes
index 7f6421e..984e9b1 100644
--- a/fedora.notes
+++ b/fedora.notes
@@ -6,7 +6,7 @@ something like:
 
 mkdir /etc/suricata/rules/emerging
 wget http://rules.emergingthreats.net/open/suricata/emerging.rules.tar.gz
-tar -xz -C /etc/suricata/rules/emerging --strip-components=1 -f emerging.rules.targ.gz
+tar -xz -C /etc/suricata/rules/emerging --strip-components=1 -f emerging.rules.tar.gz
 
 Then enable the rules in /etc/suricata/suricata.yaml
 
diff --git a/sources b/sources
index 23e4425..6e5e2e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da8bf6fc54ffe152921eb279fcfdab0f  suricata-1.4.7.tar.gz
+ef3cb7d7aa87a5d9a5b47a6f2e5ab800  suricata-2.0.tar.gz
diff --git a/suricata-2.0-flags.patch b/suricata-2.0-flags.patch
new file mode 100644
index 0000000..c7df2d0
--- /dev/null
+++ b/suricata-2.0-flags.patch
@@ -0,0 +1,46 @@
+diff -ur suricata-2.0.orig/doc/Makefile.am suricata-2.0/doc/Makefile.am
+--- suricata-2.0.orig/doc/Makefile.am	2014-03-25 04:47:37.000000000 -0400
++++ suricata-2.0/doc/Makefile.am	2014-03-26 19:26:23.661081000 -0400
+@@ -30,5 +30,3 @@
+ Ubuntu_Installation_from_GIT.txt \
+ Windows.txt
+ 
+-docdir = ${datarootdir}/doc/${PACKAGE}
+-dist_doc_DATA = ${EXTRA_DIST}
+diff -ur suricata-2.0.orig/libhtp/configure.ac suricata-2.0/libhtp/configure.ac
+--- suricata-2.0.orig/libhtp/configure.ac	2014-03-25 04:47:54.000000000 -0400
++++ suricata-2.0/libhtp/configure.ac	2014-03-26 19:33:03.982067967 -0400
+@@ -3,8 +3,8 @@
+ dnl Initialization macros
+ dnl ----------------------
+ 
+-AC_INIT([LibHTP], m4_esyscmd([./get-version.sh VERSION]))
+-AM_INIT_AUTOMAKE()
++AC_INIT(htp/htp.h, m4_esyscmd([./get-version.sh VERSION]))
++AM_INIT_AUTOMAKE(htp, $PACKAGE_VERSION, no-define)
+ 
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([htp/htp_version.h])
+diff -ur suricata-2.0.orig/src/Makefile.am suricata-2.0/src/Makefile.am
+--- suricata-2.0.orig/src/Makefile.am	2014-03-25 04:47:37.000000000 -0400
++++ suricata-2.0/src/Makefile.am	2014-03-26 19:26:23.662081000 -0400
+@@ -375,7 +375,7 @@
+ AM_CPPFLAGS = $(all_includes)
+ 
+ # the library search path.
+-suricata_LDFLAGS = $(all_libraries)
++suricata_LDFLAGS = $(all_libraries) -pie
+ suricata_LDADD = $(HTP_LDADD)
+ 
+ # Rules to build CUDA ptx modules
+@@ -437,8 +437,8 @@
+ endif
+ 
+ 
+-#suricata_CFLAGS = -Wall -fno-strict-aliasing 
+-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:
diff --git a/suricata.spec b/suricata.spec
index 483533f..8fdbb98 100644
--- a/suricata.spec
+++ b/suricata.spec
@@ -4,8 +4,8 @@
 
 Summary: Intrusion Detection System
 Name: suricata
-Version: 1.4.7
-Release: 3%{?dist}
+Version: 2.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.openinfosecfoundation.org
@@ -15,13 +15,12 @@ Source2: suricata.sysconfig
 Source3: suricata.logrotate
 Source4: fedora.notes
 Source5: suricata-tmpfiles.conf
-Patch1:  suricata-1.1.1-flags.patch
-Patch2: suricata-1.4.1-stack-protector-strong.patch
+Patch1:  suricata-2.0-flags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libyaml-devel 
 BuildRequires: libnfnetlink-devel libnetfilter_queue-devel libnet-devel
 BuildRequires: zlib-devel libpcap-devel pcre-devel libcap-ng-devel
-BuildRequires: file-devel nspr-devel nss-devel nss-softokn-devel
+BuildRequires: nspr-devel nss-devel nss-softokn-devel file-devel
 BuildRequires: jansson-devel GeoIP-devel python-devel
 %if 0%{?has_luajit}
 BuildRequires: luajit-devel
@@ -46,7 +45,6 @@ Matching, and GeoIP identification.
 %setup -q
 install -m 644 %{SOURCE4} doc/
 %patch1 -p1
-%patch2 -p1
 # This is to fix rpaths created by bad Makefile.in
 autoreconf -fv --install
 
@@ -130,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Wed Mar 26 2014 Steve Grubb <sgrubb at redhat.com> 2.0-1
+- Major new upstream release with new features
+
 * Tue Jan 21 2014 Dan Horák <dan[at]danny.cz> 1.4.7-3
 - luajit available only on selected arches