Attachment 951843 Details for Bug 1107770 – Patch to build for epel-7.

[patch] Patch to build for epel-7.

suricata-epel-7.patch (text/plain), 1.73 KB, created by Jason Ish on 2014-10-29 16:30:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Ish

Created: 2014-10-29 16:30:42 UTC

Size: 1.73 KB

patch

obsolete

>From e74fc288828c73f050c58fef2ce029a51c15da2e Mon Sep 17 00:00:00 2001
>From: Jason Ish <ish@unx.ca>
>Date: Tue, 28 Oct 2014 17:12:32 -0600
>Subject: [PATCH 1/2] Update f20 build for epel-7. Disable luajit on
> non-Fedora.
>
>---
> suricata.spec | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/suricata.spec b/suricata.spec
>index 42c6891..3916041 100644
>--- a/suricata.spec
>+++ b/suricata.spec
>@@ -1,6 +1,8 @@
> %ifarch %{ix86} x86_64 %{arm}
>+%if 0%{?fedora}
> %global has_luajit 1
> %endif
>+%endif
> 
> Summary: Intrusion Detection System
> Name: suricata
>-- 
>1.9.3
>
>
>From e435cdd707e553c81daee61e80073cff521fcb4c Mon Sep 17 00:00:00 2001
>From: Jason Ish <ish@unx.ca>
>Date: Tue, 28 Oct 2014 17:37:41 -0600
>Subject: [PATCH 2/2] Don't use copytruncate, instead rotate the log files then
> send Suricata a SIGHUP to signal rotation.
>
>---
> suricata.logrotate | 5 ++++-
> suricata.service   | 2 +-
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/suricata.logrotate b/suricata.logrotate
>index c4ece8c..5621131 100644
>--- a/suricata.logrotate
>+++ b/suricata.logrotate
>@@ -4,6 +4,9 @@
>         rotate 5
>         compress
>         delaycompress
>-        copytruncate
>         minsize 500k
>+	sharedscripts
>+	postrotate
>+	    /bin/kill -HUP `cat /var/run/suricata.pid 2> /dev/null` 2> /dev/null || true
>+	endscript
> }
>diff --git a/suricata.service b/suricata.service
>index e1c1eab..9bcdf7e 100644
>--- a/suricata.service
>+++ b/suricata.service
>@@ -3,7 +3,7 @@ Description=Suricata Intrusion Detection Service
> After=syslog.target
> 
> [Service]
>-ExecStart=/sbin/suricata -c /etc/suricata/suricata.yaml $OPTIONS
>+ExecStart=/sbin/suricata -c /etc/suricata/suricata.yaml --pidfile /var/run/suricata.pid $OPTIONS
> EnvironmentFile=-/etc/sysconfig/suricata
> 
> [Install]
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1107770: 951843 | 1122850