[suricata/f20] New upstream bug fix release

[Steve Grubb]

commit 1da5cbadb2296c6df3e97a0805e82e2a6e89989c
Author: sgrubb <sgrubb at redhat.com>
Date:   Wed Jun 25 18:16:50 2014 -0400

    New upstream bug fix release
    
    - Enable liblua support

 sources                  |    2 +-
 suricata-2.0.2-lua.patch |   14 ++++++++++++++
 suricata.spec            |   17 ++++++++++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 063ba06..7653945 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04fedf4c5148125743702ba463614e52  suricata-2.0.1.tar.gz
+90228925c6a42d41fb2ee86911bc4000  suricata-2.0.2.tar.gz
diff --git a/suricata-2.0.2-lua.patch b/suricata-2.0.2-lua.patch
new file mode 100644
index 0000000..c141748
--- /dev/null
+++ b/suricata-2.0.2-lua.patch
@@ -0,0 +1,14 @@
+diff -ur suricata-2.0.2.orig/configure.ac suricata-2.0.2/configure.ac
+--- suricata-2.0.2.orig/configure.ac	2014-06-25 11:38:53.000000000 -0400
++++ suricata-2.0.2/configure.ac	2014-06-25 17:43:21.218785000 -0400
+@@ -172,8 +172,8 @@
+     AC_MSG_CHECKING([host os])
+ 
+     # lua pkg-config name differs per OS
+-    LUA_PC_NAME="lua5.1"
+-    LUA_LIB_NAME="lua5.1"
++    LUA_PC_NAME="lua"
++    LUA_LIB_NAME="lua"
+ 
+     # If no host os was detected, try with uname
+     if test -z "$host" ; then
diff --git a/suricata.spec b/suricata.spec
index 0855fec..6bf3c65 100644
--- a/suricata.spec
+++ b/suricata.spec
@@ -4,7 +4,7 @@
 
 Summary: Intrusion Detection System
 Name: suricata
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -15,13 +15,16 @@ Source2: suricata.sysconfig
 Source3: suricata.logrotate
 Source4: fedora.notes
 Source5: suricata-tmpfiles.conf
+# Make suricata use PIE
 Patch1:  suricata-2.0-flags.patch
+# liblua is not named correctly
+Patch2: suricata-2.0.2-lua.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: nspr-devel nss-devel nss-softokn-devel file-devel
-BuildRequires: jansson-devel GeoIP-devel python-devel
+BuildRequires: jansson-devel GeoIP-devel python-devel lua-devel
 %if 0%{?has_luajit}
 BuildRequires: luajit-devel
 %endif
@@ -45,11 +48,12 @@ 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
 
 %build
-%configure --enable-gccprotect --disable-gccmarch-native --enable-nfqueue --enable-af-packet --with-libnspr-includes=/usr/include/nspr4 --with-libnss-includes=/usr/include/nss3 --enable-jansson --enable-geoip \
+%configure --enable-gccprotect --disable-gccmarch-native --enable-nfqueue --enable-af-packet --with-libnspr-includes=/usr/include/nspr4 --with-libnss-includes=/usr/include/nss3 --enable-jansson --enable-geoip --enable-lua \
 %if 0%{?has_luajit}
     --enable-luajit
 %else
@@ -128,6 +132,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Wed Jun 25 2014 Steve Grubb <sgrubb at redhat.com> 2.0.2-1
+- New upstream bug fix release
+- Enable liblua support
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Wed May 21 2014 Steve Grubb <sgrubb at redhat.com> 2.0.1-1
 - New upstream bug fix release