diff --git a/.gitignore b/.gitignore index 1e6ed35..211610b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ suricata-1.0.0.tar.gz.sig /suricata-1.3.5.tar.gz /suricata-1.4.tar.gz /suricata-1.4.2.tar.gz +/suricata-1.4.3.tar.gz diff --git a/sources b/sources index 7220257..ead7754 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c642c32e8f889448983e52a13ee8cc5f suricata-1.4.2.tar.gz +8ea0a877fb00ff1c649a92dd45e6b986 suricata-1.4.3.tar.gz diff --git a/suricata-1.4.1-stack-protector-all.patch b/suricata-1.4.1-stack-protector-all.patch deleted file mode 100644 index 68206f4..0000000 --- a/suricata-1.4.1-stack-protector-all.patch +++ /dev/null @@ -1,17 +0,0 @@ -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-1.4.1-stack-protector-strong.patch b/suricata-1.4.1-stack-protector-strong.patch new file mode 100644 index 0000000..c6bc489 --- /dev/null +++ b/suricata-1.4.1-stack-protector-strong.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-strong) + TMPCFLAGS="${CFLAGS}" +- CFLAGS="${CFLAGS} -fstack-protector" +- AC_TRY_LINK(,,SECCFLAGS="${SECCFLAGS} -fstack-protector" ++ CFLAGS="${CFLAGS} -fstack-protector-strong" ++ AC_TRY_LINK(,,SECCFLAGS="${SECCFLAGS} -fstack-protector-strong" + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + CFLAGS="${TMPCFLAGS}" diff --git a/suricata.spec b/suricata.spec index 3b4adf4..4c35ceb 100644 --- a/suricata.spec +++ b/suricata.spec @@ -1,7 +1,7 @@ Summary: Intrusion Detection System Name: suricata -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} License: GPLv2 Group: Applications/Internet @@ -12,7 +12,7 @@ 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 +Patch2: suricata-1.4.1-stack-protector-strong.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libyaml-devel libprelude-devel BuildRequires: libnfnetlink-devel libnetfilter_queue-devel libnet-devel @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/suricata %changelog +* Fri Jun 21 2013 Steve Grubb 1.4.3-1 +- New upstream bug fix release + * Mon Jun 03 2013 Steve Grubb 1.4.2-1 - New upstream bug fix release