[suricata] New upstream bugfix release

[Steve Grubb]

commit 69e67b226030a861b2bb958c71c5207995920441
Author: Steve <sgrubb at redhat.com>
Date:   Fri Mar 8 11:54:34 2013 -0500

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

 sources                                  |    2 +-
 suricata-1.4.1-stack-protector-all.patch |   17 +++++++++++++++++
 suricata.spec                            |   26 ++++++++++++++++++--------
 3 files changed, 36 insertions(+), 9 deletions(-)
---
diff --git a/sources b/sources
index 1113e24..f5f1dc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26b28d7937ca4a2e5dca6d9c2b8465ba  suricata-1.4.tar.gz
+f0805b2ad23eed176c36ac84288b17b5  suricata-1.4.1.tar.gz
diff --git a/suricata-1.4.1-stack-protector-all.patch b/suricata-1.4.1-stack-protector-all.patch
new file mode 100644
index 0000000..68206f4
--- /dev/null
+++ b/suricata-1.4.1-stack-protector-all.patch
@@ -0,0 +1,17 @@
+diff -ur suricata-1.4.1.orig/configure.ac suricata-1.4.1/configure.ac
+--- suricata-1.4.1.orig/configure.ac	2013-03-08 07:11:48.000000000 -0500
++++ suricata-1.4.1/configure.ac	2013-03-08 10:45:16.012695864 -0500
+@@ -226,10 +226,10 @@
+ 
+     AS_IF([test "x$enable_gccprotect" = "xyes"], [
+         #buffer overflow protection
+-        AC_MSG_CHECKING(for -fstack-protector)
++        AC_MSG_CHECKING(for -fstack-protector-all)
+         TMPCFLAGS="${CFLAGS}"
+-        CFLAGS="${CFLAGS} -fstack-protector"
+-        AC_TRY_LINK(,,SECCFLAGS="${SECCFLAGS} -fstack-protector"
++        CFLAGS="${CFLAGS} -fstack-protector-all"
++        AC_TRY_LINK(,,SECCFLAGS="${SECCFLAGS} -fstack-protector-all"
+         AC_MSG_RESULT(yes),
+         AC_MSG_RESULT(no))
+         CFLAGS="${TMPCFLAGS}"
diff --git a/suricata.spec b/suricata.spec
index 6a24559..a2797fe 100644
--- a/suricata.spec
+++ b/suricata.spec
@@ -1,8 +1,8 @@
 
 Summary: Intrusion Detection System
 Name: suricata
-Version: 1.4
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.openinfosecfoundation.org
@@ -12,12 +12,13 @@ Source2: suricata.sysconfig
 Source3: suricata.logrotate
 Source4: fedora.notes
 Patch1:  suricata-1.1.1-flags.patch
+Patch2: suricata-1.4.1-stack-protector-all.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libyaml-devel libprelude-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: jansson-devel
+BuildRequires: jansson-devel GeoIP-devel
 BuildRequires: systemd-units
 # Remove when rpath issues are fixed
 BuildRequires: autoconf automake libtool
@@ -32,18 +33,18 @@ just replace or emulate the existing tools in the industry, but
 will bring new ideas and technologies to the field. This new Engine
 supports Multi-threading, Automatic Protocol Detection (IP, TCP,
 UDP, ICMP, HTTP, TLS, FTP and SMB! ), Gzip Decompression, Fast IP
-Matching and coming soon hardware acceleration on CUDA and OpenCL
-GPU cards.
+Matching, and GeoIP identification.
 
 %prep
 %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-prelude --enable-af-packet  --with-libnspr-includes=/usr/include/nspr4 --with-libnss-includes=/usr/include/nss3 --enable-jansson
+%configure --enable-gccprotect --disable-gccmarch-native --enable-nfqueue --enable-prelude --enable-af-packet  --with-libnspr-includes=/usr/include/nspr4 --with-libnss-includes=/usr/include/nss3 --enable-jansson --enable-geoip
 make %{?_smp_mflags}
 
 %install
@@ -78,13 +79,15 @@ make check
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post 
+/sbin/ldconfig
 %systemd_post suricata.service
 
 %preun
 %systemd_preun suricata.service
 
 %postun
+/sbin/ldconfig
 %systemd_postun_with_restart suricata.service
 
 %files
@@ -92,8 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING doc/INSTALL doc/Basic_Setup.txt
 %doc doc/Setting_up_IPSinline_for_Linux.txt doc/fedora.notes
 %{_sbindir}/suricata
-%{_sbindir}/suricatasc
+%{_bindir}/suricatasc
 %{_libdir}/libhtp-*
+%{python_sitelib}/suricatasc*.egg-info
+%{python_sitelib}/suricatasc/*
 %attr(750,root,root) %dir %{_var}/log/suricata
 %config(noreplace) %{_sysconfdir}/suricata/suricata.yaml
 %config(noreplace) %{_sysconfdir}/suricata/classification.config
@@ -105,6 +110,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/suricata
 
 %changelog
+* Fri Mar 08 2013 Steve Grubb <sgrubb at redhat.com> 1.4.1-1
+- New upstream bugfix release
+- Enable libgeoip support
+- Switch to stack-protector-all
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild