Attachment 1122850 Details for Bug 1107770 – suricata-user.patch

[patch] suricata-user.patch

suricata-user.patch (text/plain), 2.67 KB, created by Peter Schiffer on 2016-02-10 17:18:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Schiffer

Created: 2016-02-10 17:18:25 UTC

Size: 2.67 KB

patch

obsolete

>diff --git a/suricata.spec b/suricata.spec
>index 2f6a5c1..4e5ef82 100644
>--- a/suricata.spec
>+++ b/suricata.spec
>@@ -5,7 +5,7 @@
> Summary: Intrusion Detection System
> Name: suricata
> Version: 2.0.11
>-Release: 2%{?dist}
>+Release: 3%{?dist}
> License: GPLv2
> Group: Applications/Internet
> URL: http://suricata-ids.org/
>@@ -22,7 +22,7 @@ Patch2: suricata-2.0.2-lua.patch
> # Irrelevant docs are getting installed, drop them
> Patch3: suricata-2.0.9-docs.patch
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-BuildRequires: libyaml-devel 
>+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
>@@ -102,7 +102,10 @@ make check
> %clean
> rm -rf %{buildroot}
> 
>-%post 
>+%pre
>+getent passwd suricata >/dev/null || useradd -r suricata
>+
>+%post
> /sbin/ldconfig
> %systemd_post suricata.service
> 
>@@ -122,19 +125,22 @@ rm -rf %{buildroot}
> %{_libdir}/libhtp-*
> %{python2_sitelib}/suricatasc*.egg-info
> %{python2_sitelib}/suricatasc/*
>-%config(noreplace) %{_sysconfdir}/suricata/suricata.yaml
>-%config(noreplace) %{_sysconfdir}/suricata/*.config
>-%config(noreplace) %{_sysconfdir}/suricata/rules/*.rules
>-%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/suricata
>+%config(noreplace) %attr(-,suricata,-) %{_sysconfdir}/suricata/suricata.yaml
>+%config(noreplace) %attr(-,suricata,-) %{_sysconfdir}/suricata/*.config
>+%config(noreplace) %attr(-,suricata,-) %{_sysconfdir}/suricata/rules/*.rules
>+%config(noreplace) %attr(0600,suricata,root) %{_sysconfdir}/sysconfig/suricata
> %attr(644,root,root) %{_unitdir}/suricata.service
> %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/suricata
>-%attr(750,root,root) %dir %{_var}/log/suricata
>-%attr(750,root,root) %dir %{_sysconfdir}/suricata
>-%attr(750,root,root) %dir %{_sysconfdir}/suricata/rules
>+%attr(750,suricata,root) %dir %{_var}/log/suricata
>+%attr(750,suricata,root) %dir %{_sysconfdir}/suricata
>+%attr(750,suricata,root) %dir %{_sysconfdir}/suricata/rules
> %dir /run/%{name}/
> %{_tmpfilesdir}/%{name}.conf
> 
> %changelog
>+* Wed Feb 10 2016 Peter Schiffer <pschiffe@redhat.com> 2.0.11-3
>+- Run suricata under suricata user
>+
> * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
> 
>diff --git a/suricata.sysconfig b/suricata.sysconfig
>index 8f8a5ac..e08ecf4 100644
>--- a/suricata.sysconfig
>+++ b/suricata.sysconfig
>@@ -5,4 +5,4 @@
> # --group <group name>
> 
> # Add options to be passed to the daemon
>-OPTIONS="-i eth0 "
>+OPTIONS="-i eth0 --user suricata "

Actions: View | Diff

Attachments on bug 1107770: 951843 | 1122850